Actually there are some test failures, so we need to address these first.

LGTM, but I'm not sure if we want to include this in p22 build. On one hand, this is not risky from the protocol standpoint, on the other hand we're modifying loadgen and that has a bit of risk for supercluster tests. I think we still have a bit of time before cutting the release, so we should have a run with just these changes. WDYT?

Yeah that's a good point. The good thing is that if this change did break loadgen, we'd find out pretty quickly in SSC, so I think it's fine to merge. Worst case we'll just have to revert it.